EMT PTL and UBUNTU PTL RC2 by samueltaripin · Pull Request #407 · open-edge-platform/image-composer-tool

samueltaripin · 2026-02-12T03:53:21Z

Merge Checklist

All boxes should be checked before merging the PR

[/] The changes in the PR have been built and tested
[/] Ready to merge

Description

Any Newly Introduced Dependencies

How Has This Been Tested?

Copilot

Pull request overview

This PR updates image templates for EMT PTL and Ubuntu PTL RC2 and introduces RPM “package pinning” support via an allowlist so only selected RPMs from a user repository are considered during metadata parsing.

Changes:

Extend RPM repo metadata parsing to accept an optional package allowlist and plumb it through RPM user-repo download flow.
Add AllowPackages to the template schema/config to express per-repository RPM allowlists.
Update Ubuntu 24 PTL template and add new EMT3 PTL EMF raw/rt-raw templates plus netplan additional files.

Reviewed changes

Copilot reviewed 10 out of 10 changed files in this pull request and generated 6 comments.

Show a summary per file

File	Description
internal/ospackage/rpmutils/resolver.go	Adds allowlist filtering during RPM primary.xml parsing.
internal/ospackage/rpmutils/download.go	Threads per-repo allowlist from config into RPM metadata parsing.
internal/ospackage/rpmutils/resolver_test.go	Updates test call-site for the new ParseRepositoryMetadata signature.
internal/config/config.go	Adds `AllowPackages` to `PackageRepository` YAML config struct.
internal/config/schema/os-image-template.schema.json	Adds `AllowPackages` to template schema for repositories.
image-templates/ubuntu24-x86_64-minimal-ptl.yml	Updates Ubuntu PTL repo URL, package set, kernel config, and adds netplan additional files.
image-templates/emt3-x86_64-ptl-emf-raw.yml	New EMT3 PTL EMF raw template with RPM allowlist pinning.
image-templates/emt3-x86_64-ptl-emf-rt-raw.yml	New EMT3 PTL EMF-RT raw template with RPM allowlist pinning.
config/osv/ubuntu/ubuntu24/imageconfigs/additionalfiles/ptl/01-network-manager-all.yaml	Adds netplan config to use NetworkManager renderer.
config/osv/ubuntu/ubuntu24/imageconfigs/additionalfiles/ptl/50-cloud-init.yaml	Adds netplan config for DHCP on ens3 for cloud-init use.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-02-13T07:39:56Z

+        "AllowPackages": {
+          "type": "array",
+          "description": "Optional: specific packages to include from this repository (package pinning)",
+          "items": {
+            "type": "string",
+            "minLength": 1
+          }
        }


AllowPackages is the only property in PackageRepository that starts with an uppercase letter; the rest of the schema uses lower-case keys (e.g., codename, url, pkey). This inconsistency makes templates harder to author and is easy to miss. Consider renaming the schema property to allowPackages (and updating the Go yaml tag + templates accordingly) to match the established naming pattern.

Copilot · 2026-02-13T07:39:56Z

+	PKey          string   `yaml:"pkey"`                    // Public GPG key URL for verification
+	Component     string   `yaml:"component,omitempty"`     // Repository component (e.g., "main", "restricted")
+	Priority      int      `yaml:"priority,omitempty"`      // Repository priority (higher numbers = higher priority)
+	AllowPackages []string `yaml:"AllowPackages,omitempty"` // Optional: specific packages to include from this repo (pinning)


The YAML tag for AllowPackages is capitalized (yaml:"AllowPackages,omitempty") while all other fields in PackageRepository use lower-case keys (e.g., codename, url, pkey). To avoid surprising config behavior and keep templates consistent, rename the YAML tag (and corresponding schema/templates) to a lower-camel key like allowPackages.

Suggested change

AllowPackages []string `yaml:"AllowPackages,omitempty"` // Optional: specific packages to include from this repo (pinning)

AllowPackages []string `yaml:"allowPackages,omitempty"` // Optional: specific packages to include from this repo (pinning)

Copilot · 2026-02-13T07:39:57Z

+		// Prefix match with version (e.g., "kernel-drivers-gpu-6.17.11" matches "kernel-drivers-gpu-6.17.11-1.emt3.x86_64")
+		if strings.HasPrefix(pkgName, pattern+"-") || strings.HasPrefix(pkgName, pattern) {
+			return true


matchesPackageFilter currently treats any string prefix as a match (strings.HasPrefix(pkgName, pattern)), which is broader than the comment implies (exact match or version-specific match). For example, a pattern glibc would also match glibc-common..., potentially letting in unintended packages when pinning. Consider enforcing a boundary after the pattern (e.g., exact match, or prefix followed by -/.) and/or updating the comment to match the actual behavior.

Suggested change

// Prefix match with version (e.g., "kernel-drivers-gpu-6.17.11" matches "kernel-drivers-gpu-6.17.11-1.emt3.x86_64")

if strings.HasPrefix(pkgName, pattern+"-") || strings.HasPrefix(pkgName, pattern) {

return true

// Prefix match with version, enforcing a boundary after the pattern.

// For example, "kernel-drivers-gpu-6.17.11" matches "kernel-drivers-gpu-6.17.11-1.emt3.x86_64",

// but "glibc" does not match "glibc-common-2.28-151.el8.x86_64".

if strings.HasPrefix(pkgName, pattern) {

if len(pkgName) == len(pattern) {

// Already handled by exact match above, but kept for clarity.

return true

}

next := pkgName[len(pattern)]

if next == '-' || next == '.' {

return true

}

Copilot · 2026-02-13T07:39:57Z


 			// Test ParseRepositoryMetadata
-			packages, err := ParseRepositoryMetadata(server.URL+"/", tt.filename)
+			packages, err := ParseRepositoryMetadata(server.URL+"/", tt.filename, nil)


A package filter was added to ParseRepositoryMetadata, but the tests only update the call-site and don't validate the new filtering behavior. Add a test case that passes a non-empty filter and asserts that only matching RPMs are returned (and non-matching ones are excluded).

Copilot · 2026-02-13T07:39:57Z

+    - local: ../additionalfiles/ptl/01-network-manager-all.yaml
+      final: /etc/netplan/01-network-manager-all.yaml
+    - local: ../additionalfiles/ptl/50-cloud-init.yaml


The additionalFiles.local paths resolve relative to the template directory; ../additionalfiles/ptl/... points to <repo>/additionalfiles/..., but the added netplan files are under config/osv/ubuntu/ubuntu24/imageconfigs/additionalfiles/ptl/. As written, these entries will be ignored at runtime (non-existent local path). Update the local: paths to the actual location, or move/copy the files into an additionalfiles/ptl/ directory adjacent to the templates.

Suggested change

- local: ../additionalfiles/ptl/01-network-manager-all.yaml

final: /etc/netplan/01-network-manager-all.yaml

- local: ../additionalfiles/ptl/50-cloud-init.yaml

- local: ../imageconfigs/additionalfiles/ptl/01-network-manager-all.yaml

final: /etc/netplan/01-network-manager-all.yaml

- local: ../imageconfigs/additionalfiles/ptl/50-cloud-init.yaml

Copilot · 2026-02-13T07:39:58Z

+    version: "6.12"
+    cmdline: "root=/dev/mapper/rootfs_verity console=ttyS0,115200 console=tty0 loglevel=7 sysctl.vm.overcommit_memory=1 sysctl.kernel.panic=10 sysctl.kernel.panic_on_oops=1 sysctl.fs.inotify.max_user_instances=8192 rd.parallel=1 rd.shell=0 rd.timeout=200 rd.emergency=reboot"
+    enableExtraModules: "intel_vpu uas"
+    packages:
+      - kernel-rt-drivers-gpu


The RT PTL template pins AllowPackages to kernel-rt-6.17.11 / kernel-rt-drivers-gpu-6.17.11, but the systemConfig.kernel.version is set to 6.12. With repo filtering enabled, this version mismatch is likely to exclude the intended kernel RPMs or make kernel selection ambiguous. Align kernel.version, kernel.packages, and AllowPackages to the same kernel series/version.

Suggested change

version: "6.12"

cmdline: "root=/dev/mapper/rootfs_verity console=ttyS0,115200 console=tty0 loglevel=7 sysctl.vm.overcommit_memory=1 sysctl.kernel.panic=10 sysctl.kernel.panic_on_oops=1 sysctl.fs.inotify.max_user_instances=8192 rd.parallel=1 rd.shell=0 rd.timeout=200 rd.emergency=reboot"

enableExtraModules: "intel_vpu uas"

packages:

- kernel-rt-drivers-gpu

version: "6.17.11"

cmdline: "root=/dev/mapper/rootfs_verity console=ttyS0,115200 console=tty0 loglevel=7 sysctl.vm.overcommit_memory=1 sysctl.kernel.panic=10 sysctl.kernel.panic_on_oops=1 sysctl.fs.inotify.max_user_instances=8192 rd.parallel=1 rd.shell=0 rd.timeout=200 rd.emergency=reboot"

enableExtraModules: "intel_vpu uas"

packages:

- kernel-rt-drivers-gpu-6.17.11

samueltaripin and others added 7 commits February 5, 2026 12:05

emt ptl template

11da050

emt next

5ac6785

change naming of whitelist

87b1edc

update rc2 for ubuntu ptl

ef2b88a

rename emt ptl

2968636

Merge branch 'main' into EMT_PTL

d4e6cf2

ptl update

04da10b

samueltaripin force-pushed the EMT_PTL branch from 1f5bf16 to 04da10b Compare February 13, 2026 07:22

Merge branch 'main' into EMT_PTL

0074f67

samueltaripin changed the title ~~Emt ptl - draft~~ EMT PTL and UBUNTU PTL RC2 Feb 13, 2026

samueltaripin marked this pull request as ready for review February 13, 2026 07:34

samueltaripin requested a review from a team as a code owner February 13, 2026 07:34

samueltaripin requested review from Copilot and yockgen February 13, 2026 07:34

Copilot started reviewing on behalf of samueltaripin February 13, 2026 07:34 View session

yockgen approved these changes Feb 13, 2026

View reviewed changes

samueltaripin merged commit 4f8ee1a into main Feb 13, 2026
41 checks passed

Copilot AI reviewed Feb 13, 2026

View reviewed changes

samueltaripin deleted the EMT_PTL branch March 2, 2026 01:17

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

EMT PTL and UBUNTU PTL RC2#407

EMT PTL and UBUNTU PTL RC2#407
samueltaripin merged 8 commits intomainfrom
EMT_PTL

samueltaripin commented Feb 12, 2026 •

edited

Loading

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Feb 13, 2026

Uh oh!

Copilot AI Feb 13, 2026

Uh oh!

Copilot AI Feb 13, 2026

Uh oh!

Copilot AI Feb 13, 2026

Uh oh!

Copilot AI Feb 13, 2026

Uh oh!

Copilot AI Feb 13, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

	AllowPackages []string `yaml:"AllowPackages,omitempty"` // Optional: specific packages to include from this repo (pinning)
	AllowPackages []string `yaml:"allowPackages,omitempty"` // Optional: specific packages to include from this repo (pinning)

-		// Prefix match with version (e.g., "kernel-drivers-gpu-6.17.11" matches "kernel-drivers-gpu-6.17.11-1.emt3.x86_64")
-		if strings.HasPrefix(pkgName, pattern+"-") || strings.HasPrefix(pkgName, pattern) {
-			return true
+		// Prefix match with version, enforcing a boundary after the pattern.
+		// For example, "kernel-drivers-gpu-6.17.11" matches "kernel-drivers-gpu-6.17.11-1.emt3.x86_64",
+		// but "glibc" does not match "glibc-common-2.28-151.el8.x86_64".
+		if strings.HasPrefix(pkgName, pattern) {
+			if len(pkgName) == len(pattern) {
+				// Already handled by exact match above, but kept for clarity.
+				return true
+			}
+			next := pkgName[len(pattern)]
+			if next == '-' || next == '.' {
+				return true
+			}

Conversation

samueltaripin commented Feb 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Merge Checklist

Description

Any Newly Introduced Dependencies

How Has This Been Tested?

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Feb 13, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 13, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 13, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 13, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 13, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 13, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

samueltaripin commented Feb 12, 2026 •

edited

Loading